From 5d80d6e2c3d6dc426e0214f9817dd227b5d62843 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 5 Jan 2022 19:14:09 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 514826 -> 514966 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 1ea8292164c..df431c04453 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -92,6 +92,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index ef07c8371ef66664b443d5a25a8e6d6b2c904e7f..bfe754e686f5108358a69aefc5e90ab87c9db94b 100644 GIT binary patch delta 170 zcmeC$CO>Vvd_xOk3sVbo3rh>@7Pe1`^_gi3C8@AFd! znK>zGIf?1T)(RyVsd-!q5a8h$@7Pe1`?R80P+v}3pB`N{IWDA%8 diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 08c82f5e8d1..ba5479de947 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -260,6 +260,8 @@ gb_GLOBALDEFS += \ DISABLE_DYNLOADING \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2